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

Android 11.0.0 Release 38 (RQ3A.210605.005)

Change-Id: If964d283cf218c890880e9a2a4c9c74f352764ac