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

Change-Id: Ic175e274841efe12144eccaf89941cc4dca59af7