Merge "Fix unused-but-set-variable warnings" am: eab658e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160458



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