Merge "Fix OverlayHostTest to work on secondary users."
am: 808725892c

Change-Id: Id1086b41cba03838b0d8d1643445c9052ff934e0