Merge "Only measure each UID once in InstallerTest." am: 32aac7b9c9 am: 7b6d21b37e
am: 5092952317

Change-Id: Ib352977f7f01e97bc3afefb743f3ccb7725cbaec