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

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



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