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

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

Change-Id: I09f173f479f4c49a243d1d3063b288826a0346f8