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

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



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