Merge "Provide last known cell id for emergency call" am: 761ad6eaf8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1870513

Change-Id: I4891c23dc6b5dd78618913d365c858f1c4b270bf