Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Glimpse into leaf-3.2

Change-Id: I69ca8117635e6380de1224dcb56c1020ec1bfa0f