Merge "Fix padding in management activities" into rvc-qpr-dev am: 6bc0931e86

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

Change-Id: I98cb84b9a414e6f4b54b646908a2238f39077a7d