[automerger skipped] Merge "hapticgenerator: Update fast-math settings" into...

[automerger skipped] Merge "hapticgenerator: Update fast-math settings" into main am: bea10729 am: c2b87d9d -s ours

am skip reason: Merged-In I4400bd16de8922122ea3a540999af6110e1edbf6 with SHA-1 439c8692 is already in history

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



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