Merge "Revoke the location permission properly after the emergency calls" into...

Merge "Revoke the location permission properly after the emergency calls" into main am: 7fa700d3 am: ba3f884c

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



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