Merge "Separates home and lock wallpaper metadata" into tm-qpr-dev am: 7ef0cf65 am: 131f9597

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



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