Merge "Add emergencyDial_1_6 in the HAL to modify the multisim logic for pin lock" am: 2f292b8453 am: 74ca420495

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2d0ffbc96ba77c3b55cc9ef37b75beb560d1be2