Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 6ae2535ec6 am: 2f8f97c64c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f4e7bfc059df3415378179b3d70ca35b8ebf4f1