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

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

Change-Id: I386f889cb86fcdc3bc9976789c9e69bc2b983ad7