Merge "ToneGenerator: Fix possible multiply overflow" into main am: 8ad0f403ee

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

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