Merge "Fix NetworkStatsObserversTest"
am: 0dc35fa969

Change-Id: I9b4e83b4e437089ea500d82990e59558ff55e02a