Merge "Add a flag to enable independent lock screen live wallpaper" into...

Merge "Add a flag to enable independent lock screen live wallpaper" into tm-qpr-dev am: cb69035c am: 80c05761

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



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