base

am ee249601: am b5eaf266: Merge "Update location AppOp monitoring to respect settings. If a provider is disabled, we don\'t mark an app as actively using location just because it\'s requested that provider.  Also updates the concept of high power to support third part

* commit 'ee249601a0f1fb2bcbcc04b2da044db9a2c3458b':
  Update location AppOp monitoring to respect settings. If a provider is disabled, we don't mark an app as actively using location just because it's requested that provider.  Also updates the concept of high power to support third party custom providers (doesn't hard code gps but looks at the provider's actual stated power requirement).