Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: 6194d765d2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d3eb542b1c3a9aabf51c58b8d83ad3e669f2077