[automerger skipped] Merge "Add network disconnected callback" am: 1ac46f93 am: 00d44574 am: fabb82dc -s ours am: 655b204a -s ours

am skip reason: skip tag Change-Id I602ff2c688909473b03b72c9407d4286608cff4c with SHA-1 3d805079 is already in history

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

Change-Id: I84feba26e7e0c452e507d6a9ac41f357bbbc3aa2