Merge "Replace user with debuggable check in ConnectivityService" am: 8773546980 am: ad5abee88b am: ed45defb30

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c8746e54e1461c54f8064f9fd016361b5f2e6ef