Sync with Glitch AOSP up to 0539d7063c

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