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
Change-Id: I85657eb0399a561a380179706698986317e88a05