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

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



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