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 am: 8ef91295

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



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