Merge "Protect SID and NID in ServiceState with coarse location permission" am: 7013bca07a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978547

Change-Id: I59b6531d71bdb5995f3402a1ea69d021a6a6d4d4