Merge "Do not override wallpaper picker package" into sc-v2-dev am: b70d5cc43b

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/15828145

Change-Id: I4c90d3ffee1cf4436af38e084a140630f4ccdfcf