Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24 am: 4386582dd2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00949470243a8ca63b401810bc9cb4ad3631e038