Merge "Remove unused variable" am: 9c32294690 am: f5c4a1a705

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

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