Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am: e1e0db8ca9 am: 5323b2d4cd" into oc-dr1-dev-plus-aosp
am: 1324c577e7

Change-Id: If243540cf28bd67bd659c1647c1b175ff72daba3