Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
am: e62bae21db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866 Change-Id: I2c7c2727dd932ee4d6d344810275993eb25c8e7a
This commit is contained in: