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

Change-Id: I420b0de88ca07c2114b8b4a233662498e139b37f