Merge "Cleanup annontations for Hearing Aids Profile API" am: f6b3f6a8d8
am: 73f7fd85cb

Change-Id: Iac99eb17a6093992652991d221bf1f048831d6fe