[automerger skipped] Merge "ToneGenerator: add tones for New Zealand" into tm-dev am: c3a974b3af -s ours am: c04a7a06d3 -s ours am: 2e29110ffa -s ours

am skip reason: Merged-In I0d776f3fbdbba925cf1ac272270fb36f286dff91 with SHA-1 fb1969695b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18993790

Change-Id: I99b88cd2206115e8707c5ffb521ef8a0f6b5b92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>