[automerger skipped] Merge "Add network created callback support" am: 6e55574e2b am: 9f90086a5d am: 71edf5fe40 -s ours

am skip reason: skip tag Change-Id I8c2ff7bd6980ae838abc5669f9419d62741b8666 with SHA-1 c516779578 is already in history

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

Change-Id: Ie637f132849c0d4f20b65b4e6e3e4f7d1bdf141a