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

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



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