Sync with Glitch_Flo_AOSP up to 618374e45c980c066937e8fd333800a3c95db9f2