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: I106338181467058c6c6d0a607cf428e7e9aaafd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>