[automerger skipped] SF: adjust kNonExactMatchingPenalty am: 3ef084b180 am: 52fa8e59db -s ours

am skip reason: Merged-In Ia14551e000ee1651a04ab580c4df2afcb2f8edeb with SHA-1 1c595501f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16686200

Change-Id: Ib611be9da6d1063463cd68cc93e3903c655a2eb9