[automerger skipped] Merge "Change the feature flag for Hearing Aid behavior" am: 31d6ca5c3a am: 91396395e1
am: 3cd1bff4c7  -s ours

Change-Id: I2a11dc4c80157e01b785d271d0b60440ca93f465