Merge "ToneGenerator: add tones for New Zealand" into tm-d1-dev am: 07118e7c am: 4555e90e

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



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