Merge "Make sure AccountCheckHostSideTest still passes even with..." into nougat-mr1-cts-dev
am: 581366f384

Change-Id: Iffb4f6b9c304320cee3f979b2af5baadd4127266