Merge tag 'android-4.4.4_r1' of https://android.googlesource.com/platform/frameworks/base into HEAD

Android 4.4.4 Release 1

Change-Id: I886c6ffb3a008d0cf701c1adc16c607cbf7dce39