Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/platform//packages/apps/ThemePicker into r

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I678b0d69f817cc4da4afb1240d75c29f957c4b2a