Merge "Merge "Try crop letterbox prior than content insets" into udc-dev am:...

Merge "Merge "Try crop letterbox prior than content insets" into udc-dev am: 8edd2ab2 am: 746fa8c9" into udc-d1-dev-plus-aosp am: dd2200e6 am: 90c67f8c

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



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