Merge "Change binderRpcTest to use 'activity' for a Java test service" into main