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

Change-Id: If06dc28087ad2fe14636e0147077b35af7947216