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

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

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