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

Android 5.0.2 release 1