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

Change-Id: I6f2decb7c57dcbcea209fcb032ae599d55f8a33d