Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469
am: 30f7a02a7a

Change-Id: Ibdcba33ba9bd46f08e6c1e4410acea8bc68db61b