Merge "RESTRICT AUTOMERGE - Explicitly disable BLAST for SurfaceControlViewHost surfaces" into rvc-dev am: 27f83cdb am: 56efacb8 Change-Id: I560a29c1fdfb403ac0cab1bc4b3a21523d5a8f8c