Merge "Avoid integer underflow involving maxFreqCount." am: c282248fd7 am: 81fa7ee9c3 am: 493dc25242

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0db6e64ae7aa4a4e83e2781746e50c30d10db61e