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

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

Change-Id: I91b947a20b57b9619c3a0e4ae18e690f97098878