Sync with Glitch_Flo_AOSP, from ce950c4cc13196f1ef4d3220bbfaf8c72ffefc81 to 1b13d359c7e44ce96e2558c3e926da4e05ecfc11

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