Merge "Remove customized SettingsRippleTheme" into main am: 09b835e686

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

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