[automerger skipped] Merge "Stop keeping freeform activities visible." am: 82cb76f908 am: 7c0c7500af am: 228f145562 am: 58c851053a -s ours

am skip reason: Change-Id Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037 with SHA-1 3f74b33211 is in history

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

Change-Id: I782eacad7d4a8adf5026db14bf7561ad633259d6