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

* commit 'c44de1adcf57c52ee93b4a9d2f4505e17b6cc857':
  Revert resource name to what platform ui automator test defines. b/21923650