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

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

Change-Id: I14b84674e8cf08322838017f05004b324344d35d