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

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

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