Merge "Merge "Rename test in TEST_MAPPING" into rvc-dev am: 884e9515 am:...
Merge "Merge "Rename test in TEST_MAPPING" into rvc-dev am: 884e9515 am: 59044239" into rvc-d1-dev-plus-aosp am: 0ea82aca
Change-Id: I6b3326adad2dfce1cf30e932df7135a1acb58603