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

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



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