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

Change-Id: I33778cde1415fefe985031dd637ab97d620bf284