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

Change-Id: I2f2411e9ca6564dce34123e282613c306c8734ea