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

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



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