Merge "Merge "Support CMF default wallpaper" into udc-dev am: 275eeea9" into...

Merge "Merge "Support CMF default wallpaper" into udc-dev am: 275eeea9" into udc-d1-dev am: 3a7c421f

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



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