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

Change-Id: I290a1d7adb1f454d3ee3c13439ac76f93c6e4951