Merge "Update the TEST_MAPPING files on AOSP (framework/base)"