Merge changes from topic "am-d925c47a33f9421884915d19b487219a" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "ToneGenerator: add tones for New Zealand" into tm-dev am: c3a974b3af -s ours am: c04a7a06d3 -s ours
  [automerger skipped] ToneGenerator: add tones for New Zealand am: 436c4c88b8 -s ours am: 8a13467f8b -s ours