Merge "Make sure Manage button updates for display size changes" into sc-dev am: ea1518fa am: c71f3b1a am: 661b4adc

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

Change-Id: I48a0f4a7185d31cd093db3f9f18218264354b738