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

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

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