Merge "Revert "Move NetworkControllerImpl to @LongRunning thread to prevent @Background from being stuck"" into tm-qpr-dev am: 24e16e4a21 am: 4f5395dc32

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

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