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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id91a68fb8d0da44f496d9f173a4b91015ba9ecdc