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

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

Change-Id: I5af42a21fb438f828980ffc05dc3a9be32e6314d