Merge "Provide last known cell id for emergency call" am: 5d5f729f01 am: 305a953734

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1869812

Change-Id: I15dfbe81615a5d22ff618c2ad5d6d16bb2afa468