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 am: 65ce0d0f" into rvc-qpr-dev-plus-aosp am: 69176e99

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

Change-Id: I333ad938540ac181cbbb65dd2fe4c2a27e7255eb