Merge changes from topic "am-123ae9009f714cc7b7ffa4872e443111" into main
* changes:
[automerger skipped] Merge "C2Buffer: don't check for right and bottom crop at mapping" into android15-tests-dev am: 33b1bdbb -s ours
[automerger skipped] C2Buffer: don't check for right and bottom crop at mapping am: 6a779599 -s ours