Merge "Revert "Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792"" into nyc-mr2-dev-plus-aosp
am: c23ff1d477

Change-Id: I9161929f3a7308be4764dbb50e443a46fdc4960c