Merge "MediaCodec : Update javadoc for ROI encoding" into main am: 418b684759 am: 1a12edb641

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

Change-Id: Ia3a86036181f0a96b693d58b3feddc8ff29a42d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>