Merge "Ensure that the pip transaction matrix has only scale & rotation info"...

Merge "Ensure that the pip transaction matrix has only scale & rotation info" into sc-dev am: 7780fa9e am: cacc7541 am: 28265dd3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15184134

Change-Id: I9dc434fa19e82c0aa4748301a57a6492d3372e70