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

Change-Id: I6df88313ac932cf7df953bfb11f658e06f8c6691