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: a2ea69f6 am: d1f64b24

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

Change-Id: I739cc5e594a6563be51528798fefc4b7df06e98b