Merge "Revert "Add WFC Entitlement ID in RadioInfo to let tester update the entitlement id"" into tm-dev am: 0d302aae46

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/17822816

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