[automerger skipped] Merge "ToneGenerator: add tones for New Zealand" into...

[automerger skipped] Merge "ToneGenerator: add tones for New Zealand" into tm-dev am: c3a974b3 -s ours am: c04a7a06 -s ours

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

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



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