Merge "Add HAL for pdu session id support" am: 9fece51be5 am: 1c8bae8301 am: 3724bcb85a

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

Change-Id: I4fc5fa50e015c3479cbe0d913eaa21f35a407b28