Merge "Merge "Change BLACK to TRANSPARENT to fix test" into rvc-dev am:...
Merge "Merge "Change BLACK to TRANSPARENT to fix test" into rvc-dev am: ed3c3005 am: b96a8a58" into rvc-d1-dev-plus-aosp am: 9ef10bc0 am: b32a997b
Change-Id: I4067440684564419e7a5cf9c6ab84be0a9ad811c