Merge "Merge "Flip the lockscreen live wallpaper flag" into udc-qpr-dev am:...

Merge "Merge "Flip the lockscreen live wallpaper flag" into udc-qpr-dev am: ce48e229" into udc-qpr-dev-plus-aosp am: f7e4f4ee

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



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