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

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

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