Merge "Remove unused variables." am: 3bb81137 am: 05ddd9f3 am: b2dd6cdf...

Merge "Remove unused variables." am: 3bb81137 am: 05ddd9f3 am: b2dd6cdf am: 9d2d9874 am: db51985c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2199615



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