Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 10314062

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



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