Merge "Only check letterbox position in book mode" into tm-qpr-dev am:...

Merge "Only check letterbox position in book mode" into tm-qpr-dev am: edc5058b am: ef53043c am: ca7d53d8 am: d07f8e18

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



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