Merge "[AWARE] Add support for Subscribe Service ID List Attribute"
am: 11cea0d4a3

Change-Id: I4ab614028e59c0ae2effab6cc7e1b65172bb3335