[automerger skipped] Merge "Backport 'add config to disable snapshots'." into...

[automerger skipped] Merge "Backport 'add config to disable snapshots'." into sc-v2-dev-plus-aosp am: 8e05a690 -s ours

am skip reason: Merged-In I83d9ab4a15a862ea220debdd8da8b3d5673da276 with SHA-1 fb257c22 is already in history

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

Change-Id: I66b18a757808425fd0b889b55057bd230e7f9c2e