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

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



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