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

[automerger skipped] RESTRICT AUTOMERGE Revert "Support CMF default wallpaper" am: 72a0125b am: 1a737b75 -s ours

am skip reason: subject contains skip directive

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



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