Merge "Migrate show when lock behavior to handleRequset" into udc-qpr-dev am:...

Merge "Migrate show when lock behavior to handleRequset" into udc-qpr-dev am: a0e33a38 am: b37216ed

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



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