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

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

Change-Id: I377370bfa6dc665dbc8cdbf60a3f60871f81e229