Merge "Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b am: 1c5a742c am: 4929093f"