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 am: 4dd72eef

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



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