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-dev-plus-aosp am: 89af8c69 am: 55c06128

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



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