Merge "Merge "Fix visibility change during entering PIP app transition" into...

Merge "Merge "Fix visibility change during entering PIP app transition" into tm-dev am: 7284a6a9 am: 900a3f9f" into tm-d1-dev-plus-aosp am: 3897c70a

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



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