Merge "Revert resource name to what platform ui automator test defines. b/21923650" into ub-launcher3-burnaby