Merge "Fix NetworkStatsAccessTest" am: ec1f25a4ba
am: cdb75d321b

Change-Id: I5ef9861438bbe474b4e4670b8fdba4368531978d