Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator" am: 613e6e3e9a am: 84b074eef8

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

Change-Id: I33842982a1a94a37d2e8b7aa78f5bc9b6e86326e