[automerger skipped] Fix education flows for thin letterbox am: 1d6f6bd2 -s ours

am skip reason: Merged-In I7fb1ff2ee0540325218a379259c5277cff1367ad with SHA-1 194c2175 is already in history

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



Change-Id: I49db95b0dcaebe468252d7f608bd8ad5f3c63c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>