[automerger skipped] Merge "ToneGenerator: Fix possible multiply overflow"...

[automerger skipped] Merge "ToneGenerator: Fix possible multiply overflow" into main am: 8ad0f403 am: 6106ae77 -s ours

am skip reason: Merged-In I49b9ff7a39110b680024b51ba446cb8960ae6137 with SHA-1 7281d0b9 is already in history

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



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