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

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

Change-Id: I73f87629e3e116a5a3f24d9a6088ef45dea89119