Merge "Remove unused variables." am: 3bb8113739 am: 05ddd9f313

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

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