Merge "Handle letterbox education when disabled" into 24D1-dev am: 9e78e2af

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



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