Merge "[automerger skipped] Make sure the Hearing Aid source is ready before...
Merge "[automerger skipped] Make sure the Hearing Aid source is ready before resuming or suspending calls am: 0b1e01ff am: ba550a61 -s ours am skip reason: change_id I6ae11faab3d530c65f55ffa9b8a9f3cae2bde5f4 with SHA1 b9039cab is in history" into qt-r1-dev-plus-aosp