[automerger skipped] Merge "Add network created callback support" am: c542ed20fa am: cc030c76f5 am: 06b2fd7114 -s ours

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

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

Change-Id: Ie637f132849c0d4f20b65b4e6e3e4f7d1bdf141a
tree: ad16b7a13472ff41ba2dee87ecd00f8f0213d025
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING