Merge "Compute config based on original override for inherited letterbox" into...

Merge "Compute config based on original override for inherited letterbox" into udc-dev am: db387438

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



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