Merge "Remove unnecessary local variable" into main am: 06d20c68 am:...

Merge "Remove unnecessary local variable" into main am: 06d20c68 am: 5236c220 am: b9f0f4bb am: af75d23a am: c0284ff9

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



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