Merge "Remove debuggable restriction on testing purpose method" am: 492f7e3c1c am: 15df9c37a7

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

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