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

Change-Id: I1164f2786b55f029283d309a951dddeb610fcb47