Sync with Glitch_Flo_AOSP, from 6c121f6d52f63043c36141c2b6e67cbd2efdb414 to aee9bac9872e70379d225af07da68b543178f7bc

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