[automerger skipped] Merge "OpenSLES: Fix deprecated volatile op warning" into main am: e7a596c480 am: 4e0d2475a5 -s ours

am skip reason: Merged-In I201f3fc2a66a45ade9f6501f1ab90f5963223cd1 with SHA-1 1fc782b4d0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/2965727

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