Merge "Fix testActivityServiceBindingLru for secondary users."
am: 4906e30a2c

Change-Id: Ia17f9904f5491ca4b90b5ff9a7eac4b5a1d6d0ab