Merge "[4/4] Move new picker logic to AOSP" into sc-dev am: aa984f5a4b

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

Change-Id: Ic9c03b3cde69265190688d1f5e36927d861cf4a9