[automerger skipped] Merge "Fix miss tracking downstream problem in...

[automerger skipped] Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator" into mainline-prod am: f1ad3b34 -s ours

am skip reason: Change-Id Ide5206b013acdc499344e1c839a830c5b245af41 with SHA-1 5c7d8e53 is in history

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

Change-Id: I5d3c5a119bceb600049025a4f5c9e5517c633c97