Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabe3fe4ab7fcad9e8c3f7ad89a49d3d5b1a874ce