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

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

Change-Id: I167c64c1a372672ace65869176e9499a99b84b8c