Merge "Call on urls changed callback when callback added" am: 62e4a9516d am: 0c8c709bd5 am: bd7c802dd7

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

Change-Id: I75a060de7a5af002dfd5febed456b2bd26785602