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

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

Change-Id: Iee4a8244b7f7066fc8422eade8baa06dd87212bd