Merge "Only consider to keep activity config if invisible requested" into...

Merge "Only consider to keep activity config if invisible requested" into tm-qpr-dev am: 38657089 am: bfc5bb40

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



Change-Id: If9ced02bd69084761039793c0353ba70b4f2f2fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>