Merge "Replace @NeededForTesting w/ proguard keep flags (1/2)" into ub-contactsdialer-g-dev