Merge "Letterbox education: Updated UI" into tm-qpr-dev am: 4f878b4c am: 1b976d8e

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



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