Sync with Glitch_Flo_AOSP up to 402519ff2fd8057dc1d3a38f2c88ce1e85b8b3e7