Merge "CtsFsMgrTestCases secondary_user"
am: fb11bfd77d

Change-Id: I3cbb1dee08e8ac0ea5ae341eee0ac3aefe17003d