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

Change-Id: I4e2820e13586a94a19e48dc0ae3656750b36f657