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
Change-Id: Ibe54835fbde3c0b19b6f7e1a4e763bd3f8e00647