Merge "RESTRICT AUTOMERGE - Explicitly disable BLAST for SurfaceControlViewHost surfaces" into rvc-dev am: 27f83cdb am: 06a617aa Change-Id: Ida2bb69d6493db8992b70044bcd8946fefe67de5