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

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

Change-Id: Ie6fb7e5711ddecf5c97a1afb69da2ffb39010b5d