Merge "[Thread] update tracking bug for thead_enabled_platform flag" into main...

Merge "[Thread] update tracking bug for thead_enabled_platform flag" into main am: 3ffcbdc1 am: ad4017c6

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



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