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

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

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