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 am: 4472bf50

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



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