[automerger skipped] Merge "Call on urls changed callback when callback added"...

[automerger skipped] Merge "Call on urls changed callback when callback added" am: 62e4a951 am: 0c8c709b am: bd7c802d am: 67790790 am: ffc020e7 -s ours

am skip reason: Change-Id Ibfcb8aaae9d410a09ec98e57d77eccd34fcc222f with SHA-1 ab5ff1b3 is in history

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

Change-Id: I37154398668b5b7bb6754a03490a7b334e2dfe70