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

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



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