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

[automerger skipped] Merge "ToneGenerator: add tones for New Zealand" into tm-dev am: c3a974b3 am: eff0b66a -s ours am: e5f7e15c -s ours am: 57105a4c -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: If5471d1c2671ac6d08bffde99709883c0feb125a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>