Merge "Fix swipe up show-when-locked activity" into udc-dev am: febee0e5 am: c334c293

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



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