Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am: a6ce3f3021
am: 900620cffc

Change-Id: I730e7c550b88325a418c419340e6f98080f89969