Merge "Work around for display info mismatch during the PiP transition" into rvc-dev am: dbb9d1412b am: f9eacfff57 am: 34fe9e085b am: 319a31de53
Change-Id: I478382986c7f8e5e1c15ae8f96c9844413f3c4d7
This commit is contained in: