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

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

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