Merge "ToneGenerator: add tones for New Zealand" into tm-dev am: c3a974b3af

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

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