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

Change-Id: If0cbe508435551186d6b5e51c0890eace46a8f15