Merge "Selected border visible in light theme." into tm-qpr-dev am: 032f978c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21078622



Change-Id: I0062c5a7ae3c262177909f252fe8548a534c790b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>