Merge "Remove unnecessary local variable" into main am: 06d20c6838 am: 5236c22076 am: b9f0f4bb76 am: af75d23a46

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

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