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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66ea4ffd478100286b27299ef95714f90b8a1c6d