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

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

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