Merge "Tweak test size annotations." into ub-contactsdialer-g-dev
am: b8db2184df

Change-Id: I6a2c551da18ecc6d7cfc2b20b85b5eef6a1fcc91