Merge "Fix an instance of -Wunused-but-set-variable." am: c10adebed6 am: daa2a19c60

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

Change-Id: I1b2e62708ebe008ad5e22b563c1dc18b55bb2295