[TP] Move flag am: dea718c886 am: 4e09a0e744

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

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