Merge "Exclude translation caused by surface insets from the matrix" into rvc-dev am: 126e671343 am: 3f94c62f03 am: 430f4f1a37 am: ef01714ef7

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

Change-Id: I6e306d4a9fa8e573ff504a0008c73bef8ac703c2