[automerger skipped] Merge "Add support for pdu session id" am: 3798c10c am: 9b902351 am: 0f9531a5 -s ours

am skip reason: Change-Id Ia59d7e9bf9a450da4b51a2884166d3b0fa93a7c9 with SHA-1 8888ec18 is in history

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

Change-Id: Ic2ad4500589d009fa53b37d9ee37ea8c09185ef1