Merge "Put com.android.location.provider before services on the system server...
Merge "Put com.android.location.provider before services on the system server classpath." into rvc-dev am: c26cfa1c am: 97229ee5
Change-Id: I8a36f49aa13558ed76264a7c676bf4168f11b4fb