Merge "Consider multiple show-when-locked activities for wallpaper" into...

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

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



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