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

Change-Id: I5bfd4bbe9fb05ab8e8decb95b68e452c614f3016