Merge "Improve SettingsTransitionActivity for standalone usage." into sc-dev am: 0d6ceb67 am: 7b56adce

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

Change-Id: I34ed63065c7413a02df9a4db56702123de3680d8