Merge "Try crop letterbox prior than content insets" into udc-dev am: 8edd2ab2e6 am: e60a12703b

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

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