Sync with Glitch_Flo_AOSP, from 889ddfcf0e4565c351d2180bd0d23245aa150128 to f2e8e540fc1656e821181374c52776644ff4fe83

Signed-off-by: Tk-Glitch <Ti3noU@gmail.com>