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: Iba23b5123e35d95a301b8574871d2d15cc8403b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>