Merge "Reduce binary size by excluding perfetto consumer" am: 35e12321a5 am: f6e3f2043e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2412735

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