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

Change-Id: I1d5394b2392cce260d9f935cf6d44bb93f70a1a2