rebase msim frameworks/base patch
Merge branch 'master' of https://github.com/wulsic/android_patchesnevisp