Merge tag 'android-5.0.2_r1' into HEAD

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
	services/core/java/com/android/server/AlarmManagerService.java

Change-Id: Ia071d0ac78ce292f23700674698a349cc8eb5d25