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

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



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