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

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

Change-Id: I19ae95e792b097a3171f47a701081dc1c8893e79