Merge "[sf] fix overflow in snapshot generator" into udc-qpr-dev am: a32dcc26 am: 588ae1bc

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



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