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

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

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