Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25
am: 1c5a742cb8

Change-Id: I50416d50c0723bbf33d83226c5536287096de75d