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