[automerger skipped] Merge "Test conflict notification work when using cached address" into mainline-prod am: b2c2e72b -s ours

am skip reason: Change-Id Id0c1afb5563954ffee1f598a3a5de6a245d77a0e with SHA-1 7d5c2cf2 is in history

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

Change-Id: Ieda918e1cce7696c4523b4829ea7dd78d407aa82