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

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



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