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

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



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