Merge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev am: 2f42cbcad5
am: c10a5dc4ab  -s ours

Change-Id: I35284d792f8d02bae753caedd12db9600c3d462d