Merge "RESTRICT AUTOMERGE Revert "Support CMF default wallpaper"" into udc-dev am: 1c53aa4f

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



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