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

Change-Id: I72e31ea65fd9e60ec6e02d76682d8bd769b2554c