[automerger skipped] SyncEvent: modernize C++ am: 068e08ee am: 5c08d92b...

[automerger skipped] SyncEvent: modernize C++ am: 068e08ee am: 5c08d92b am: b20f72a9 am: c5a5f831 am: 45cd1798 am: 0ff8c93c -s ours

am skip reason: Merged-In I37711f4271c68042f178db9370549c0c3260ace8 with SHA-1 e45f2195 is already in history

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



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