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: ba5d9dcb

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



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