Merge "Fix inconsistent widths in manage menu." into rvc-dev am: 87117a3a...

Merge "Fix inconsistent widths in manage menu." into rvc-dev am: 87117a3a am: b8e87ca1 am: a71b9685

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

Change-Id: I2a783ce392937aa1516a7ff6c5a6b147fcdba3cf