[automerger skipped] Fix -Winteger-overflow am: e4127a7e5b am: 7db0ef18a6 -s ours am: 313f922a8c -s ours

am skip reason: Merged-In I58ba8f63789e84e7077f8dda58a2d21242175e4b with SHA-1 da3e002d9b is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel/+/2870015

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