Merge "Stop keeping freeform activities visible." am: 82cb76f908 am: 7c0c7500af am: 228f145562

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

Change-Id: Ic8d21190554258331fb99c4f23e80573616558c3