vendor services (to arrays.xml)

Conflicts:

	core/res/res/values/arrays.xml
	services/java/com/android/server/SystemServer.java

Conflicts:

	core/res/res/values/arrays.xml
	services/java/com/android/server/SystemServer.java

Conflicts:
	core/res/res/values/arrays.xml
	core/res/res/values/public.xml
	services/java/com/android/server/SystemServer.java

Conflicts:

	core/res/res/values/arrays.xml