Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15

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

Change-Id: If4c82a4c6d23e06d3b6351fee45109c3631a46ae