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

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

Change-Id: I7e0f6c1b1734e143e9febbe7afd1e3f8a1573569