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

Change-Id: I9416d9fe19e565803670c05014c1efdf6e5ae785