Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356599



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