Merge changes from topic "snapshot_migration" into tm-dev am: a5f192f7 am: 7f30809b

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



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