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

Change-Id: I6a7b8a240d090b0132a80fe9869d31326010f8c0