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

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



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