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

Change-Id: I5265257607e8af1405df3665331ef8e32986d16b