Merge changes from topic...

Merge changes from topic "revert-3283578-revert-3272135-revert-3267014-revert-3208491-ndk_trace-EUQVSBHTRX-ELHECXUOUD-OVFLURPEJG-ITAIYMHVSD" into main am: ad04dd90

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



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