Merge "Add support for pdu session id" am: 3798c10c1d am: 9b90235154

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

Change-Id: I5f0bd8c18d3e55ceac10bcb14f72dc914f7e2da3