[automerger skipped] Merge "Change the feature flag for Hearing Aid behavior"...
[automerger skipped] Merge "Change the feature flag for Hearing Aid behavior" into pi-dev am: 546c4048 -s ours
am: 595da4cd -s ours
Change-Id: I804a876b682ac5e464cc5f176507a3a053b8a304