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

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

Change-Id: I099612e1a8b69fbe382c2aed95e96364d5407c8c