Merge "Consolidate adb helper methods into single class." into ub-contactsdialer-h-dev
am: e40ba9b7f9

Change-Id: I7eaa91cb0f8db5750141acfb39f2dfbc320ba36f