Merge "Do not record snapshot when snapshots are disabled" into udc-dev am:...

Merge "Do not record snapshot when snapshots are disabled" into udc-dev am: 28e76d58 am: b67bcedd am: 98171d74 am: c191de64

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



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