Merge "Reduce binary size by excluding perfetto consumer" am: 35e12321a5 am: 7064dcc82b am: a7afbe3d81

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

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