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: a9146661 am: 8d0b5b52 am: e0e8893e

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



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