Merge "Remove unused variable." am: 3130b032 am: a96265a2 am: 95306a5a...

Merge "Remove unused variable." am: 3130b032 am: a96265a2 am: 95306a5a am: e4cffb73 am: 4082e439

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



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