Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: 99f0ad7b3e am: 7334ba2cb9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73403fbbf0f7ba0a233e4866273698fb0f43019b