Merge "Fix emergencyDial_1_6_withServices in VTS 1.6" am: b1fe78fb63

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1648207

Change-Id: I3087ced88bf029d75b7f28dbf8f4d728cb74f699