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

Merge "ToneGenerator: add tones for New Zealand" into tm-d1-dev am: 07118e7c am: 75b972cf am: 498ec363

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



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