Merge "SEAndroid: location policies for alarm_svc socket and test apps"