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

Change-Id: I15fe35a5d4b0387df32a9373dbdb95d5321360df