Merge "Change the feature flag for Hearing Aid behavior" am: c920b2ef41
am: f0f0df3d29

Change-Id: Iafa3a8dd6dcf0cf730cf5f7017badff35cd497ea