[automerger skipped] Merge "Rename extractor symbols to log session id" into...

[automerger skipped] Merge "Rename extractor symbols to log session id" into sc-dev am: 5a5befc4 am: bdc71f70 -s ours am: 6b79fcfc -s ours

am skip reason: Merged-In Idfa64caade07760a0193bb9036115f8b6cf71049 with SHA-1 6dbe0d0c is already in history

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

Change-Id: Ibaea0ba27b82d2569a23ac8467494ff1d3326192