Merge "Add test for TREL service not unpublish when feature disabled" into main am: 5c66824a44 am: c9c1bd26ff

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3364408

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