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

Change-Id: I6bd364dc72d82d05905c54753885549e7b42e0f9