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

Change-Id: I4c255621db616337c20d8e239dfe409545dea18a