[automerger skipped] RESTRICT AUTOMERGE Revert "RESTRICT AUTOMERGE Revert...

[automerger skipped] RESTRICT AUTOMERGE Revert "RESTRICT AUTOMERGE Revert "Support CMF default wallpaper"" am: 89daca57 am: 3bd93846 -s ours

am skip reason: subject contains skip directive

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



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