Merge "Disable comparison in user release builds" into tm-dev am: 5409851f43 am: 19bb30b0cf

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

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