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

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

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