Merge "Merge "Protect SID and NID in ServiceState with coarse location permission" am: 7013bca0 am: 5dbc71e1 am: 0b5def20"