[automerger skipped] Merge "Fix education flows for thin letterbox" into...

[automerger skipped] Merge "Fix education flows for thin letterbox" into 24D1-dev am: 3fdae375 -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: I89fa3d756fc903b1176676981109a0d827841e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>