Merge "[Thread] rename FEATURE_THREADNETWORK to FEATURE_THREAD_NETWORK" into main am: a3ad41ea3d am: d1f4348edf am: e2e419c489

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

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