Merge "YemenMobile, Remove a APN(42103) and Update ims APN(42111)" into main am: 87525e8f70 am: 879519a7aa

Original change: https://android-review.googlesource.com/c/device/sample/+/2906901

Change-Id: I432905274551fe8284306ebd6a1a6acb06441abd
Signed-off-by: Automerger Merge Worker <[email protected]>