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: 9b7c1b11

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



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