Merge "Avoid integer underflow involving maxFreqCount." am: c282248fd7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71b4123571ad13006eceacc5b0cc9cd63f77a8a8