[automerger skipped] Merge "Remove customized SettingsRippleTheme" into main am: 09b835e686 am: 02a76858ad am: 3c1255de6e -s ours

am skip reason: Merged-In I7337d25889c4091ae8d3c063caa30cbf1edd4930 with SHA-1 cb737f8159 is already in history

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

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