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

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

Change-Id: I9584a01fec3759396382ce17dc6a7904b85cbcc6