Merge "TM#getLastKnownCellIdentity throws SE requires incorrect permission" into tm-dev