[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 skip reason: Change-Id Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037 with SHA-1 1bb6900a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90aa7044066cfe15ee894c8323b76ef9ec0deecd