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: ef9de236 am: 1ffe89a4

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

Change-Id: I1a4a1b1794c770be12303b0994d84a78d14aa890