Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576
am: 0c08f5d44e" into rvc-d1-dev-plus-aosp am: 3e841653dc
Change-Id: I3a167c01c60b10a258225f53364d3efa65123c72
This commit is contained in: