Merge "RESTRICT AUTOMERGE Revert "Support CMF default wallpaper"" into udc-dev...

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

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



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