Merge "Add com.android.location.provider to the system server classpath." into...
Merge "Add com.android.location.provider to the system server classpath." into oc-mr1-dev am: d215d903
am: 34317b13
Change-Id: Ib393f52ae9aba1ebe2433c62e49ebb3418ed4629