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

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



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