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

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



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