Merge "Fix emergencyDialResponse in VTS 1.6" am: b840a0cdd3 am: a6d37dd0c1

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

Change-Id: I6a007c75d25fa8fd79173cd84302d3fbfa98d6be