Merge "Adapt the boot logic for lockscreen live wallpapers" into udc-dev am:...

Merge "Adapt the boot logic for lockscreen live wallpapers" into udc-dev am: bf491532 am: 565edeb3 am: 64d1c9bc

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



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