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

Change-Id: Ib76c1063705267b9627b2de4b204c92dc8233350