Merge "atrace: New --prefer_sdk flag" into main am: 5e1cbe0668

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3042215

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