[automerger skipped] Merge "Merge "Prevent transparent region in SurfaceViewSyncTests" into nougat-cts-dev am: c083cb5191" into nougat-mr1-cts-dev
am: 309dc6a29f  -s ours

Change-Id: I3856d513a76b182437a9ee1aeb2c7f96364010d7