Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733

Change-Id: Iba9854a104ba9b427868d3d66731fc3e76383664