Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c86

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

Change-Id: If0f27e8d83ee1879b7cfeef526d6fc37d4b07dee