[automerger skipped] Merge "Code review cleanup" into main am: 91bed2e4 am:...

[automerger skipped] Merge "Code review cleanup" into main am: 91bed2e4 am: 97e92883 -s ours am: 12c20c96 -s ours

am skip reason: Merged-In Ie98cd3f7605b0768a8a3cfe92a93f53a5a4d172f with SHA-1 aab4eda4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2834823



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