Merge "[sf] Use layer id as snapshot ids" into udc-dev am: 91913766 am: 9cc919b5

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



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