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

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

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