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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie79141820782688b8705cf0edc59cf7a60c74f13