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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcaddb813f501065921e55b6e8a33269c1f4f95f