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

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

Change-Id: Ie10591e45c44b386ecb2138c5d862b03f65ee4f4