Merge "Stop raw channel thread before converting to a secure channel." into...

Merge "Stop raw channel thread before converting to a secure channel." into udc-dev am: 8d551e48 am: dc6a3b39

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



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