[automerger skipped] Merge "[Thread] rename package name for Thread platform...

[automerger skipped] Merge "[Thread] rename package name for Thread platform flags" into main am: 33ec6c0f -s ours am: 7c693040 -s ours

am skip reason: Merged-In Icacf88f7c0aa499b4b29f4072ae58840f0b1761f with SHA-1 9cb44920 is already in history

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



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