Merge "Remove controls when apps are stopped or removed" into rvc-dev am:...

Merge "Remove controls when apps are stopped or removed" into rvc-dev am: a56a27a9 am: 76a5c332 am: 9b82b9de am: 76c64ef2

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

Change-Id: Ief84a7735a97380901ead50f868347d5b117c3fd