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

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

Change-Id: I9e02be67124e48a6891b2e7175030ad796ad4284