Merge "Consider multiple show-when-locked activities for wallpaper" into udc-dev am: fa7b5d52

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



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