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

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

Change-Id: I4b4d75c8a4f1de07aa7bb68b12d150d7c85c9cc1