Merge "Revert "Added trace event to broadcastIntentWithFeature."" into main am: c4cb9057ad am: 80e712c72e

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

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