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

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

Change-Id: I83ecbbb5b2715a784421b1a14a9eef099f3cddf9