Merge "Protect SID and NID in ServiceState with coarse location permission"