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

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



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