Merge "Fix testActivityServiceBindingLru for secondary users."