Merge "Remove ignored annotations." am: 8523de7588 am: 2bb38c61f0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519066

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c04325021abb048583ec1a28169505fe8d594ef