[automerger skipped] Merge "Change the feature flag for Hearing Aid behavior" into pi-dev am: f9b54878b1  -s ours
am: 230d873062  -s ours

Change-Id: I804a876b682ac5e464cc5f176507a3a053b8a304