[automerger skipped] Merge "Add emergencyDial_1_6 in the HAL to modify the...

[automerger skipped] Merge "Add emergencyDial_1_6 in the HAL to modify the multisim logic for pin lock" am: 0c5fec28 am: 78d2245b am: 24aa7e7b -s ours am: ce4a6d75 -s ours

am skip reason: Change-Id I6d495199af4d2abbf22cf6dded4ee4ecf1407f3a with SHA-1 3bf3e332 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cf22bdffc5d66c391e7ed499344a445be2f8147