Merge "Temporary decouple snapshot controller from transition." into udc-dev...

Merge "Temporary decouple snapshot controller from transition." into udc-dev am: 1f0b42df am: c60d20fd

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



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