Merge "Fix the SetConnectivityStatus callback" into tm-qpr-dev am: d1f2c290

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



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