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

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

Change-Id: I230f1c56e59f7b5416fdf8f0c1709ea72aa2d58e