Merge "Remove unused but set variables" am: 97fe4d0cc4 am: 61555f903b am: 09a4234051 am: 5f6036a5d1 am: b8a44c6c21

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

Change-Id: I8e419079afa2d969b6a6b92393794457b37f5413