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

Change-Id: I1808b686058b6c020da4fb62a940fed5faa79a3e