Merge "Use assigned UUID for Hearing Aid Service" am: d310970d36
am: 7f2091c522

Change-Id: I3e54498760d071a38d60467c2865a77374f8c928