[automerger skipped] Merge "Fix the SetConnectivityStatus callback" into...

[automerger skipped] Merge "Fix the SetConnectivityStatus callback" into tm-qpr-dev am: d1f2c290 am: 7e19bd3c -s ours

am skip reason: Merged-In I6560e016ee1663779b3c59d45520ef98507cad77 with SHA-1 621f87e3 is already in history

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



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