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

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



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