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

[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "RESTRICT AUTOMERGE Revert "Support CMF default wallpaper""" into udc-qpr-dev am: 3b9bd623 am: 1bf7a518 -s ours

am skip reason: subject contains skip directive

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



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