Fix lint errors in tools/hiddenapi am: f16a93c5b2 am: 5705a1f7ee am: 80167cbe5c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87be2aa6f4428a699ef45ea1016da85e81c1fbcd