Merge "Polish Configuration activity" into sc-dev am: d15c63903a am: 37f2801aad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974994 Change-Id: Ifc331eeb3c97a5bccb22ba1d7548d58a2de1173d
This commit is contained in: