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

Merge "Try crop letterbox prior than content insets" into udc-dev am: 8edd2ab2 am: e60a1270 am: 7b933759 am: b834a4c1

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



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