[automerger skipped] Merge "Fix emergencyDial tests in VTS 1.6" into sc-dev...

[automerger skipped] Merge "Fix emergencyDial tests in VTS 1.6" into sc-dev am: d6f28cdf am: 4952aeaa -s ours am: 547dbe37 -s ours

am skip reason: Merged-In Iebf32061c7944104a8d4a0297af9204ca214e627 with SHA-1 0e7aca8e is already in history

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

Change-Id: I963aa92349a7445429a0ad1dadd56034712be207