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

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

Change-Id: I9d1606b37d90b5c639edc5e38341e429737ac7a3