[automerger skipped] Merge "Add NetworkMonitor constants to SystemApi" am:...
[automerger skipped] Merge "Add NetworkMonitor constants to SystemApi" am: c3a6317b am: 95b523ce
am: d0436c71 -s ours
am skip reason: change_id I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5 with SHA1 d0a93347 is in history
Change-Id: I2b7a39367fbd27612258adc3bf0e093e4b7fdd99