Merge "Merge "Support CMF default wallpaper" into udc-dev am: 275eeea9" into udc-dev-plus-aosp am: 89af8c69

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23004845



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