Merge "Merge "Hide PiP menu when expanding" into rvc-dev am: 86f8ef1a am:...
Merge "Merge "Hide PiP menu when expanding" into rvc-dev am: 86f8ef1a am: 8c1ec790" into rvc-d1-dev-plus-aosp am: cd602a82
Change-Id: I00af1566f728a8a71581c16a0746e48172c24ee8