Merge "Fix unused-but-set-variable warning" am: 14c914335a

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

Change-Id: Ia17fc33e54497d2dd9bf10b9a206967199d596e2