Merge "Merge "Use normal rotation while PiP is toggling or active" into...
Merge "Merge "Use normal rotation while PiP is toggling or active" into rvc-dev am: 3b648e41 am: ebbfb1b1 am: b300644a" into rvc-qpr-dev-plus-aosp am: b4c6a9c0
Original change: undetermined
Change-Id: I9307f58ab8dd52946b2209964bfdb9ce6087edb2