Merge "[sf] Update snapshots after screenshots" into udc-dev am: 39fcb504...

Merge "[sf] Update snapshots after screenshots" into udc-dev am: 39fcb504 am: a482b289 am: a0ec532d

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



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