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

Change-Id: I6666568d1078d0d7dd9fb298dd9bf9c2911062d5