[automerger skipped] Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4385ef6896 am: cc018f77ec am: db1ad4da2b -s ours

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

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

Change-Id: I97d82338363702be56963839a241e1d72c1e9c86
tree: 3c373d6422ce92df77c2ee08e49341531636320f
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS