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

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

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



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