Merge "Change the feature flag for Hearing Aid behavior"
am: 31d6ca5c3a

Change-Id: I8bcd4abd4aeef7d88e43c1ef0c1b21b3cbd75149