[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Support CMF default...

[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Support CMF default wallpaper"" into udc-dev am: 1c53aa4f am: 17584e97 -s ours

am skip reason: subject contains skip directive

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



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