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

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

Change-Id: I765d39d31f5b9c3d158f0f0da18d9276b0e7f477