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: 6f4ac8a8 am: ebd9d479

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

Change-Id: Icb12df4bff486656139135f0b69cc5096b7c202f