Merge "Update TEST_MAPPINGs for autofill test in Activity path"