Merge "Removes AOSP tests from TEST_MAPPING" into udc-qpr-dev