Merge "Support different types of transitions." into sc-dev am: 332ee0f374
am: 49d0153039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961 Change-Id: I8816392867a15914859d10d62e73219319516514
This commit is contained in: