Merge "Re-enable the Hearing Aid Profile"
am: 7c0f2dc0ae

Change-Id: I211dfc4804e2a32bab820d72fd9e3a5d466854c6