Merge branch 'q' of https://github.com/BlissRoms/platform_frameworks_base into pixel

Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I4136b5fc5c4768db3ff076768694f1efab64690c