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

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

Change-Id: Ib9106fba33057b9b49a58d6b1dcc7d95f296ce55