Merge "Merge tag 'android-7.1.2_r5' of https://android.googlesource.com/platform//packages/apps/ExactCalculator into HEAD" into n7.1