Merge "[sf] optimize snapshot updates" into udc-qpr-dev am: 59a58b049b

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

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