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

Change-Id: Ie4b85e22fe74d8d07424edeacfc285a3cbd67dd0