Merge "Fix emergencyDial_1_6_withServices in VTS 1.6" am: b1fe78fb63 am: 25b1f1e773 am: 72d3d7ac21

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

Change-Id: I3c446341588f374c5e9aca595c946836044fcefa