Merge "Add debug wait to RunMethodInstrumentation" into ub-contactsdialer-h-dev
am: 6130a3b03c

Change-Id: I334a8033e47ee90162da99b80cdcef894c72490d