Merge "Move MultipathPolicyTracker back to framework" am: a2c355cc18 am: 8192596775 am: cecbb25a26

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I154a34e1fc7247d1b03091daab2d99d69103b9a6