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

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