Merge changes from topic "blackflash" into udc-qpr-dev am: fba6a29e

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



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