Merge "RESTRICT AUTOMERGE Center align the lock screen wallpaper" into udc-dev...

Merge "RESTRICT AUTOMERGE Center align the lock screen wallpaper" into udc-dev am: 6ff853d8 am: f6b8d793 am: ab40f4c0

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



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