Merge "Merge "Compare letterbox and bar content frame with the same rotation"...

Merge "Merge "Compare letterbox and bar content frame with the same rotation" into rvc-dev am: 65ddf5fa am: 61d9623e" into rvc-d1-dev-plus-aosp am: 0c5165a6

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

Change-Id: If97df927de05b0c78289cd24884a88d67d160bac