Merge "Work around for display info mismatch during the PiP transition" into rvc-dev am: dbb9d1412b am: 013a422e53 am: 3cbecf7a22 am: 8dc679812a
Change-Id: I85f81a7e52e044c368bca9ab97c90626f6e5b0da
This commit is contained in: