Merge "Consider multiple show-when-locked activities for wallpaper" into udc-dev am: fa7b5d52 am: afe9b435 am: 9095d8d8 am: 9c7b9403

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



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