Merge "Merge "Try crop letterbox prior than content insets" into udc-dev am: 8edd2ab2e6 am: 746fa8c95e" into udc-d1-dev-plus-aosp