Merge "SurfaceView: Fix unsafe transaction accesses" into sc-v2-dev am: 830bf8bd34 am: 7fbc3903aa

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

Change-Id: I243ec3e0f95fba48916a8c18b875e0e15a070ba0