Merge "Update condition for when to show letterbox" into tm-qpr-dev am: 69d2637f am: 6514372b

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



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