Sync with Glitch AOSP up to 321de91c328e7f00c5eb031e3cdb5bed2b634926

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