Merge "TM#getLastKnownCellIdentity throws SE requires incorrect permission" into tm-dev am: 92124ce516 am: 432de455e6

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

Change-Id: Ieb22d70405adcfe7eb7740d311945557ce61e9e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>