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

Change-Id: I103e5121a5ebc37706ed5132f29ee4c670cca5c5