Merge "Deprecate MENU_STATE_CLOSE for PiP menu" into sc-v2-dev am: 8fdc8dcad7 am: 6b1f0fd118

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

Change-Id: I3ec9c3bafd79f7060b894b2a36785ce2ac0f4121