Merge "CtsStatsdHostTestCases secondary_user"
am: dcda619bd8

Change-Id: I6bfd6955a7b25d5d484119f00a557b8ec7ab5788