Merge tag 'android-4.4.3_r1.1'

Android 4.4.3 release 1.1
Merge tag 'android-4.4.3_r1.1'

Android 4.4.3 release 1.1
Merge branch 'kitkat' of github.com:AOKP/packages_apps_Settings into kitkat
Merge branch 'kitkat_mr2' of github.com:AOKP/packages_apps_Settings into kitkat
Add missing strings from merge for NFC Polling