[automerger skipped] ToneGenerator: add tones for New Zealand am: 436c4c88...

[automerger skipped] ToneGenerator: add tones for New Zealand am: 436c4c88 -s ours am: 8a13467f -s ours am: 69e059cb -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: Ia410c11fdf447221a8fdf24849e65083ce8dd0b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>