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

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

Change-Id: Ifce19a7d4a41e40740ee86f03789a2072f2af7e2