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

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



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