Merge "Remove always-empty variable" am: 88a03065a2 am: 734c0ee397 am: 9b89d129d9 am: f13c105921

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

Change-Id: I77ee989b4e2497559e8662313b8281f387786673