Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c am: 52abac27 am: ffcb0249

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

Change-Id: I9e0e9acdb0e24478ce64be7e6e5e1b97110e5ab8