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

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

Change-Id: I94d772167cc66076e7d95574810e9017bea0c7b7