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

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

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



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