Merge change 1939 into donut

* changes:
  Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.