Merge "Merge "Revert "PiP: Potentially hide menu immediately after it...

Merge "Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c am: ca10fdaa am: 62b824a3" into rvc-qpr-dev-plus-aosp am: 0510a86c

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

Change-Id: I8fb125a01da1e049b76575c9ed4445916e7f5455