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: 52abac27 am: ffcb0249" into rvc-qpr-dev-plus-aosp am: 502d2bbb

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

Change-Id: I7cdcb845dad39f269fb233f46d6ded8f1e12cd0f