Merge "Remove unused variables." am: 3bb8113739 am: 05ddd9f313 am: b2dd6cdf8a am: 9d2d98747e am: db51985caa

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>