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

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

Change-Id: I0b1240d76b7090e8588bf92ecc84c34f7933f388