Merge "[CTT-3] Add a string converter for TCP and UDP protocol number" am: 7d3d4eaca7

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

Change-Id: I01167aa9e2754e7fd26054c62f49aa29f6201ffb