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

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

Change-Id: I08d2bab62b1bdbc9eaaf0a562880d352e6437f2f