[automerger skipped] Merge "Remove code related to stolen trace sessions" into...

[automerger skipped] Merge "Remove code related to stolen trace sessions" into main am: e25896fd -s ours

am skip reason: Merged-In I9b199c3040db47cdf1c6ef7cd03567e785a63b17 with SHA-1 b738940c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3214086



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