Merge "Add keyguard before app removal in Home Controls" into udc-dev am: e38a303d am: fc3606fe am: a014b4b0

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



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