Merge "Merge "Consider multiple show-when-locked activities for wallpaper" into udc-dev am: fa7b5d52 am: ba5d9dcb am: fb127c1f" into udc-qpr-dev-plus-aosp am: 5a93b31b

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



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