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: 9aeefef3 am: 74d01575
Change-Id: I0bf66689ae7ed7bed80a190428b850f4d710ae19