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

Merge "Add the ripple effect to the highlight background" into tm-dev am: 56e3f60d am: 7446f166 am: f5b2d6bf am: 4271a34c

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



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