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

[automerger skipped] Merge "Stop keeping freeform activities visible." into rvc-qpr-dev am: f0bd7906 -s ours am: 0492435e -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e46fa035a8cb540396df36fbd5995251b8ee98e