[automerger skipped] Merge Android U (ab/10368041) am: bac433fdc1 -s ours am: a09e8adce7 -s ours am: 4b3265e1d1 -s ours

am skip reason: Merged-In Ifea4c01d14f32c6d902e63255f8c60a883842873 with SHA-1 266e938026 is already in history

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

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