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

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

Change-Id: I7095f3e7ce171f0be9402d91475b74e623316545