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

Change-Id: I1015f61c7c856ad10afdc71e8da9d18739084a18