Merge "CtsLogdTestCases secondary_user"
am: 28becd0399

Change-Id: Icd3fbe9bb509b1ee64da84518d4399485851bd2d