Merge "Remove always-empty variable" am: 88a03065a2

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

Change-Id: I88359d77f76cf8b2cfa6bc88cebe5bd55732fc3a