Merge "SEAndroid: location policies for location-mq-s"