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

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

Change-Id: I5958f7aca243efc627f9eb9554db6b50e2a5a25d