Merge "Merge "Add TEST_MAPPING to overlay test directories" into rvc-dev am:...
Merge "Merge "Add TEST_MAPPING to overlay test directories" into rvc-dev am: 30cefb33 am: 18866da9" into rvc-d1-dev-plus-aosp am: 9f267edb
Change-Id: Iaa05c008e0baf9389705557318fcbea9e794e446