[automerger skipped] Merge "Add HAL for pdu session id support" am: 9fece51be5 am: 1c8bae8301 am: 3724bcb85a am: 9d3183cbec -s ours

am skip reason: Change-Id I1637fe48c785eae28f04e55cdb6fcabd606d744f with SHA-1 8723b2565f is in history

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

Change-Id: Ide5033c067d9f24db765463a5deb71f2849b6432