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

Change-Id: I3464a515734350bbd9b411932b2d6616a7ffcd58