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

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

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