Merge "Fix The education UI above one-handed mode isn't localized and Display...

Merge "Fix The education UI above one-handed mode isn't localized and Display size changes" into sc-dev am: 9801436e am: d0a24a6a

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

Change-Id: Ia3c89a8a68c055262be745fede98ec5a15e1f7ac