Merge "Revert transition codes in SettingsLib" into sc-dev am: b26f7ed9 am: 9dbaba82 am: f83fecdc

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

Change-Id: Ib2c84885c7e9cc31eba39d13919ea1289ec74205