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

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



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