Merge "Fix typo TOLERENCE --> TOLERANCE" am: aefe92f478 am: 9a1634a944

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407716

Change-Id: I559930d33986ffe298c6d549f86b2f739418ccea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>