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: f5c7d9b2

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



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