Merge "Don't track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location.  There is no reason to show Android OS in that list simply because of internal location requests supporting other clients." into klp-dev