Merge remote-tracking branch 'keystone/p-fs-release' into platform_update_PPR1.180321.001

 Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/res/layout/mobile_signal_group.xml
	packages/SystemUI/res/values-zh-rCN/strings.xml
	packages/SystemUI/res/values-zh-rTW/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I927aa7099157957d2c95175e880c390ad24eea03