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

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



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