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: Ice2d34db5e085a1897018cbc1bb9f8c5ec2e994c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>