Merge tag 'android-5.1.0_r1' into merge-5.1

Android 5.1.0 release 1

Conflicts:
	res/layout/stopwatch_notif_collapsed.xml
	res/layout/stopwatch_notif_expanded.xml
	res/values-en-rIN/array.xml
	res/values-zh-rCN/array.xml
	res/values/array.xml
	src/com/android/deskclock/AlarmClockFragment.java
	src/com/android/deskclock/SettingsActivity.java
	src/com/android/deskclock/worldclock/CitiesActivity.java

Change-Id: Ic861c90216b82290378be7072d6be760ef5be372