Merge "Remove unused variable" am: 9c32294690

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

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