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

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

Change-Id: Icf64f6052eb24586d4617fef717f6faad98b240e