Merge "Fix multipathPolicyTracker query-update loop" am: 8e2a6f76c7 am: 7b28c1b5af

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

Change-Id: I593b710113029661ab2e89cbb7f5dfabb97153c0