Merge "Revert transition codes in SettingsLib" into sc-dev am: b26f7ed9 am: 3440bef8 am: 63d1529a

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

Change-Id: I5be5724403f0654264d037c3db5842fabb6127df