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

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



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