Merge "Remove unused variables." am: 3bb8113739

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

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