[automerger skipped] Merge "Add network created callback support" am: 6e55574e am: 9f90086a am: 71edf5fe -s ours am: 68e8b019 -s ours

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

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

Change-Id: Ic3eb42e549295ad094c8158570f3228a8a2d1c53