Merge tag 'android-5.0.2_r1' into HEAD

Android 5.0.2 release 1

Conflicts:
	core/res/res/values/config.xml
	services/core/java/com/android/server/AlarmManagerService.java

Change-Id: I5bfefc70b628ed2e4d5a243b077c5e218a045bb0