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

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



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