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

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

Change-Id: I83169eaa386d4a4620b838832852bec4b14d7489