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: a55c64be

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



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