[automerger skipped] Merge "Stop keeping freeform activities visible." am:...

[automerger skipped] Merge "Stop keeping freeform activities visible." am: 82cb76f9 am: 7c0c7500 am: 228f1455 am: 58c85105 -s ours

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

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

Change-Id: I782eacad7d4a8adf5026db14bf7561ad633259d6