Merge remote-tracking branch 'caf/LA.BR.1.2.3_1' into caf/cm-12.1

Conflicts:
	res/layout/add_speed_dial_dialog.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/dialer/CallDetailActivity.java
	src/com/android/dialer/PhoneCallDetails.java
	src/com/android/dialer/SpecialCharSequenceMgr.java
	src/com/android/dialer/calllog/CallLogQueryHandler.java
	src/com/android/dialer/calllog/SpinnerContent.java
	src/com/android/dialer/callstats/CallStatsQueryHandler.java
	src/com/android/dialer/dialpad/DialpadFragment.java

Change-Id: Ifb295da1d60278795ffc0e1fbbce55163e17c041