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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67b1eced4442c8033f370e908d23f05e6abb837c