Merge "Fix emergencyDial tests in VTS 1.6" into sc-dev am: d6f28cdf4a

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

Change-Id: Ia0bf3f6b2d57f65b67800db742c05cd2cf9eb9b4