[automerger skipped] Merge "Add network created callback support" am: 1b7563cb1e am: d9763ad11b am: 4f7c63a58a -s ours

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

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

Change-Id: Ie637f132849c0d4f20b65b4e6e3e4f7d1bdf141a
tree: f85e896afa22eab852cd154dacbafdf649f0c3a0
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING