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 am: 2f7776c2
Change-Id: I053cb151c9e21f2c6cefc917fc19df1a45077fa1