tree a846da0b9d4c613939106dac0d5dee4a1f7f7461
parent bbad5c2e39eefd806aa404dc806c1620a5a68fc2
parent 4c527243874056738031a207f78f2a7a1b644211
author Bill Yi <byi@google.com> 1600502456 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600502456 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d9893cc541 am: b23d8dc514 -s ours am: a1dab60746 -s ours am: 4c52724387 -s ours

am skip reason: Change-Id I30a00b2166b014e09dbbe380ac92e94d76438075 with SHA-1 90ef95dcfa is in history

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

Change-Id: Ia61f1d98edb63896ad5120e6bca65df0d55d421c