Merge tag 'android-5.0.2_r1' into LA.BR.1.2.1

Android 5.0.2 release 1

Conflicts:
	core/res/res/values-mcc310-mnc004/config.xml
	core/res/res/values-mcc311-mnc480/config.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	services/core/java/com/android/server/am/ProcessList.java
	services/java/com/android/server/SystemServer.java

Change-Id: Ief237d10575468a042f8a0f3eb6aa8335e0d0cf5