Merge "Fix split colour in Letterbox Landscape mode" into tm-qpr-dev am: cf93bf71 am: e301f9fa

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



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