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

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

Change-Id: I89485a40be2db3c88620b219331d1072f55249b3