Merge "Merge "Compare letterbox and bar content frame with the same rotation" into rvc-dev am: 65ddf5fa17 am: 61d9623eac" into rvc-d1-dev-plus-aosp