am 211aef30: Merge change 7134 into donut

Merge commit '211aef308bc6ca55d99777d19227f412492db9c2'

* commit '211aef308bc6ca55d99777d19227f412492db9c2':
  Unhide required definitions in TextToSpeech.Engine that cover return codes and