Merge "Fix an NPE on cancellation when connection is closed" into tm-dev am: 21469e70 am: bafea9dd am: 490b6604 am: c7b648f7

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



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