Merge "Ignores Resources.NotFoundException when setting ViewStructure.setTestIdEntry()."